Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 02:35:20 +0000 (18:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 02:35:20 +0000 (18:35 -0800)

Trivial merge